Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 20:16:31 +0000 (13:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 20:16:31 +0000 (13:16 -0700)

Trivial merge